Merge of "Updates to jump instead of go for .. alii