Master to Dev GA 1.0.2