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