Merge "update docs for consistency"