Revert "Revert "Merge remote-tracking branch 'apache/master'""

This reverts commit 601187a9dd7d49ab137db83f1c6d2b857ec24e63.