Merge "Do not trigger distribution-merge by controller"