Moving changes to b-dev from 3.1