Merge branch 'stack-user' into dt-test