Updates to merge back to master branch

As in subject