Merge branch 'develop' into patch/JAL-4110_stdout_for_tests