New depth calculation; fails the unittests currently [ci skip]
Merge branch 'dev-bls-depth' into v1.15
Changed the unittests so that wrong depth will not cause a failure