Hr8083
d36a2722 · merge changes from n-g-d branches/340-stretch ·