Merge branch 'fix/fix-type-depth' into 'develop'