Changes in preparation for moving features to master branch.