Merge "Merge remote-tracking branch '4.9/tmp-77d3588' into 4.9"