Merge remote-tracking branch 'apache/release/0.9.9'