Merge branch 'code-cleanup' into dt-test
Merge branch 'enabled-base' into dt-test