Merge branch 'sg/t5318-cleanup'