Training develop

Rabasing training material updates - cherry picked commits from #224 and #251