Fixes #2134 - Merge branch 'specs' into fix-2134-merge-specs-submodule