Merge branch 'bg/fix-t7003'