Merged master into dualstack and fixed a couple of bugs