Commit 1.3.9

To complete merge.
Commit 1.4

To complete merge