Merge branch 'en/incl-forward-decl'