Merge branch 'hotfix/1.13.1'
Minor errors in comments
Merge branch 'ulsa-patch-1' into develop