FX 2.1 Fixes
Merge commit '21fa287529b9e2df1e542cf4031dfcda30c68cd5'