Merge branch 'jk/apache-test-for-2.4' into maint