msml-dev-nico branch commit
remaining stuff
Merge branch 'msml-dev-nico-nb' into experimental

(merge fixed)