Patch v.3.8 - updated FCE & mapping configuration