Since this is not cherry picked into the profile registry PR, will this complicate merging this and the other PR?