Merge "Fix dcae fe config"