Merge "Fix failing dackka test" into main