Merge "Fix bad join on ChangeTag subquery"