Merge branch 'r/1.3.5' into develop
Push tags in deploy script
Credit bug report
Merge branch 'r/1.3.5'