Merge "Fix dynamic reconfiguration" into feature/zuulv3