Merge "Add support for scaling mode parameter"