[ADD] %rest:error annotations extended. Closes #915
Merge branch 'stable'