Merge "Merge remote-tracking branch '4.9/tmp-0c058ce' into 4.9"