Semantic rewrite
Merge remote-tracking branch 'origin/stable' into stable
TODO: remove \engl