Marge with k2m30/hspace/master

Merge