Initial dist subtree commit
From old comp