[BACKLOG-197] Updates from OEMDOC epic related to the changes made during BACKLOG-197
Merge pull request #1888 from brendan-lynch/master

[BACKLOG-197] Updates from OEMDOC epic related to the changes made durin...