Merge remote-tracking branch 'apache/4.22'