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