FQA-1665: Maintain ECMS FNC-PLF4.0