
* Revert "manual rollback of of 18530 (#18531)" This reverts commit 3f79f8cba5425e964f05fc79331dc5ff4b82c22f. * Fix the offset calculation * Add a unit test
* Revert "manual rollback of of 18530 (#18531)" This reverts commit 3f79f8cba5425e964f05fc79331dc5ff4b82c22f. * Fix the offset calculation * Add a unit test