Merge branch 'ht/blank' into ht/namespaces