Merge pull request #5151
Merge pull request #5151 in develop
Merge pull request #5151 in master
Merge pull request #5171
Merge pull request #5171 in develop
Merge pull request #5171 in master
Merge pull request #5155
Merge pull request #5155 in develop
Merge pull request #5155 in master
Merge pull request #5145
Merge pull request #5145 in develop
Merge pull request #5145 in master
Merge pull request #5123
Merge pull request #5123 in develop
Merge pull request #5123 in master
Merge pull request #5122 from localheinz/hotfix/spelling

Fix spelling
Remove inline comment, add comment to class property
Fix spelling
Merge pull request #5114
Merge pull request #5114 in develop