Merge branch 'osc' into release