FQA-1705: Maintain PLF 4.0/ECMS-FNC