Merge "Test upscaling as well as downscaling" into experimental