Merge branch 'fc/t3200-fixes'