Merge "Adding scale factor check."