Berts updates on bertsfeature branch
Merge branch 'bertsfeature'
merge conflicts resolved