Merge "const methods and comments"