t485 - fix FR sustainer test to avoid type saving issues
Merge remote branch 'origin/7.x-4.x' into 7.x-4.x