#685: #556: more fr consistency work

opened by thuchacz