Merge "Export location flags" into main