Merge branch 'bug/JAL-3523_cwd_not_preserved' into develop