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

...g BACKLOG-197