Merge "Adding tacker support back into Danube"