ACT-1571: Fix failing QA