Merge branch 'release/1.3.6' into develop
More cleanup/streamline
bump 1.3.7
Merge branch 'release/1.3.7'