Merge branch 'hotfix/1.3.10' into develop
Comment fixes.
Merge branch 'release/1.3.11'