[BACKLOG-195] Merge from oemdoc and minor code fixes