Merge branch 'master' into 'dev'

Synchronize Dev branch with Master

See merge request !12
1 job for dev_gui_features in 3 minutes and 42 seconds (queued for 3 seconds)