Merge "Fix tacker not starting correctly" into stable/danube