Merge branch '264_fixed_examples_branch_2' into 'master'

264 fixed examples branch 2

Closes #264

See merge request !251
2 jobs for 223-update-editor in 34 minutes and 20 seconds
latest