Pulling in 1.2 update from @kentagern