Merge "Adding tacker support"