Merge "Cherry Maintenance Doc updates"