[hr] backport 1.3 to master