#638: #556: May 22 batch of FR consistency work

opened by thuchacz