Merge "Bump hacking to 0.9.x series"