Merge branch 'AddJsonConfigFileClass'