Feature/issue 323 size decl types

Tested and pulled into hotfix/v2.0.2 branch already.