All "rt4" branches are merged to master, so pull-live from master

Reverts 784eb98 and d55c00c.