Merge remote-tracking branch 'origin/feature/7541_replace_workspace'
Re #7868 Add option not to load history
Merge branch 'feature/7868_load_history_option' into develop