Pushing ostiosis-d(ev) changes to master