Merge "Unify topology versions used in controller"