v317 review2 Changes

v317_preview to v317_preview2 (2015-05-18 to 2015-05-25) v317