trying to preserve CPPFLAGS...
Merge branch 'ot'