Merge "Bump hacking to 3.0.0"