Merge branch 'v2.0.5'
Implement `%` and `@` markers