Merge branch 'improvement/JAL-4212_remove_macos_test_java_icons' into merge/big_merge...