Fix removal of suffixes for values that have them
Fixes suffix removal for fields that use them
Merge remote-tracking branch 'upstream/master'