Merge branch 'cb/t5608-cleanup'