Merge "move selectAll to match framework"