FQA-1226: ECMS/SE/Friendly and Other Checks
FQA-1226: ECMS/SE/Friendly and Other Checks - fix bug