Merge "Remove duration_hours etc and use ICU data"