T-17. Prepare for include in other projects. Fix #17.