Merge "Improve documentation of constants throughout the codebase"