Merge branch 'ost' into release