Adding code review feedback and rebasing

Covering code review feedback and rebasing to latest release.