Hr8079
92f51b12 · merge changes from branches/340-stretch ·