Re-merge SDK1.3.0 history back into SDK1.3.1

SDK1.3.0 was mistakenly released as a squash commit. This merge re-integrates
that squashed commit, along with the actual individual changes back into SDK1.3.1
so that SDK1.3.1 will have the actual SDK1.3.0 release in its history.

The squash commit will be visible in the history, however git blame should show
the correct individual commits