Fix indentation
Merge pull request #5145 in master
Merge pull request #5123
Merge pull request #5123 in develop