Merge pull request #1957 from mdamour1976/5.2

[BACKLOG-735] UserConsoleResource