* commit '261e00cb046db01b2bae9342f34ff99e99ada368': Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
* commit '261e00cb046db01b2bae9342f34ff99e99ada368': Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.