Merge pull request #1 from pcarenza/jb-mr1

Jb mr1
revert BoardConfig changes