Merge branch 'sg/t4051-fix'