Merge remote-tracking branch 'apache/3.0' into develop