Upgrade/jb 0.9.9.14

Pushing the changes up the line