Merge branch 'osc-bugfix' into release