Merge "Update hacking"