Add inline comments
Remove inline comment, add comment to class property
Merge pull request #5121
Merge pull request #5121 in master