Merge branch 'develop' into critical/JAL-3933_log4j_update_for_develop_branch