Merge "refactor open tab code"