Commit from bd with correction on config and templates