Update from Hotaru master