Merge "Add check for undefined scale factor fields" into main