view scaling integration
view scale refinements
Resolve merge conflict.