Merge "Add flags for OneGrid project" into main