Merge branch 'errata/tx2-219' into for-next/fixes