Merge from fisadev repo and add my custom config