#697: #556: fr consistency o to s

opened by thuchacz