FFS upstream

Eisenhauer, Gregrequested to merge
github/fork/eisenhauer/FFSupstream into master

Upstream patches fix a performance bug in non-code-generated conversions.

Merge request reports