Merge branch 'develop' into improvement/JAL-1988+JAL-3416_Java8_macOS_APQHandlers_and...