Merge branch 'hotfix/1.2.15.0'
Filename was changed. Title typo was fixed.
Merge branch 'hotfix/1.2.16.0' into develop