Trunk snapshot push

[Andrus Adamchik]

BTW, planning to push trunk SNAPSHOT now. I need a fix for CAY-1142  
(again, not a new issue, so no need to delay M5).

Andrus