This seems to be added after a merge with some kaspermarkus' branch during pilots, so please point me to the right version of this file and I'll update my pull with it.