Merge branch 'release/1.3.6' into production
Merge tag 'v1.3.6'

1.3.6