Merge branch 'master' into feature/8912_CLI_new_branch_to_solve_conflicts
Solve conflicts master/develop, re #8912
Solve more conflicts master/develop, re #8912