UC-54 Suggested updates for current pull request
UC-54 Updated docs
UC-54 Updates to comments/docs as per code review
Merge pull request #5270 from Wikia/UC-54-Garth

UC-54 Suggested updates for current pull request