Final commit for 1.3.0 update