UC-152 code review changes