1.3.6
Merge branch 'release/1.3.6' into develop