Re-integrating the now old ra-performance branch into a git-flow branch. I could have merged it but this was easier with so few changes