Bring latest from master into branch

Bringing latest into branch to avoid problems down the line