[PLAT-5906] - Consistent behaviour of shifting and scaling in scenarios Reviewed-by: Tim