Completing the merge to the acidental commit

This will finish the sync of the branches after the acidental commit to master.