Support from 1.4.7-R1.0
Merge remote-tracking branch 'origin/master'