[hr] pull from 1.2 to master