Merge branch 'mark-stable'