OS-198 backport FMA DE and agent changes to 3.x