Merge "Add new PropertyTransformation DrawScale" into main