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