Merge branch 'wk/t1304-wo-USER'