Merge "Further fixes to treat 0-frequency words"