Merge "Break long lines and generalize some comments in /rdbms"