Merge branch 'pr-12' into stable
Merge branch 'stable'