Merge "Re-add the loe flag with metadata" into main