Master to Dev GA 1.0.0

Bring dev and master in sync