Partilly revert previous commit
Merge branch 'fix-getting-quantum-range-and-depth'