Training common

Merge of Goore pull request after conflicts resolve