Merged branch configfile to trunk