Updating master with ostiosis-d