Merge "Fix dirty Z prop"