E0d/release merge

@jarv @polesye @dmitchell @jzoldak 

Please review this updated PR and new branch.  If things look good, I'll merge to master and create the release branch.