merge from branch stable-succint-jumping