Merge branch '18-update-to-changes-in-main' into 'master'

Resolve "update to changes in Main"

Closes #18

See merge request !17
2 jobs from master in 31 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #14404
riseclipse
build

00:00:14

 
  Deploy
passed #14405
riseclipse
deploy

00:00:17