Merge "Removed flag from environment" into main