Merge branch 'apache:master' into fix-comparison-page