Pulling unmerged 1.3 work into 1.3 dev branch