Merge back parallel to master branch

parallel branch is feature complete and tested