Merge "Doc change: collapse key fix." into jb-mr2-dev