Use espmartin's Settings and f/base - jb-mr1-wip branch