Merge "Update constants" into main