Merge "Auto-reconfigure after change-merged event" into feature/zuulv3