Merge "Update flag for offload implementation" into main