Merge branch 'sg/t5516-fixes'