Merge branch 'libhydra-bye-bye'