[PLAT-5028] Better handling of offsets