Verify previously committed code in public-release branch

verify @megamind code in public-release branch is complete.