Merge branch 'ar/t6031' into next