Plain Diff
Merge branch 'cherry-pick-89a1cbff' into '1.2.2-fixes' See merge request fusiondirectory/fd!457