UC-54 Suggested updates for current pull request