Merge pull request #1884 from bmorrise/dev

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