First part of the #118 issue
Merge branch 'blackwell' of github.com:tdt/core into blackwell