[SR-Dev] git:master: port from branch 1.5, r5802