#684: #556: fr consistency h through o

opened by thuchacz