Second attempt to merge #488