Merge "Fix surface properties not getting applied correctly"