v317 review Changes

v316_base to v317_preview (2015-05-11 to 2015-05-18) v317