UC-74 Address CR feeback
CC @garthwebb