2836 nfr phalcon config merge