Last part of Slope Block
Merge branch 'develop' of ssh://git.tujen.com/home/ubuntu/shiftingdrip into develop