Merge "Freeze tab improvements"