Trying to bring 1.3.1 changes back into this branch

testing automerge