Merge "Forgive me monkeys, for I have sinned." into jb-dev