Merge branch 'bug_fix_LOADUI_487' into fixing-integration-tests
Merge branch 'bug_fix_LOADUI_487' into fixing-integration-tests since environmental issues are supposed to be fixed in bug_fix_LOADUI_487
Merge branch 'fixing-integration-tests' into bug_fix_LOADUI_487 in preparation to consolidate all test-fixing in one branch