Fixed regression in development code with stacks not starting at base line
Merge remote-tracking branch 'origin/master'