Merge "Make pane logic consistent with documentation" into tm-dev