[BACKLOG-197] Additional changes for BACKLOG-197
Merge pull request #1890 from brendan-lynch/master

[BACKLOG-197] Additional changes for BACKLOG-197