Rebase for updated project work

There have been updates to mainline since this work started.

Here is a PR to bring these updated changes into melchor629 version