v332 branch Changes

v332_preview2 to v332_base (2016-04-25 to 2016-05-02) v332