Merge "Fix default scale value" into main