Fixes FER- Short description of the changes made What was the motivation & context behind this PR? How has this PR been tested?
