[Code Style] DocBlock fixes and improvements. Fix #2951, fix #2952