merged Hotot 0.9.8.10