Revert "remerged confi.json temporarely"

This reverts commit ee769122fb07b570885a000e22ae4a13da1023d1.
Revert "Revert "remerged confi.json temporarely""

This reverts commit 8a90b4f5f0fac4e7d9c852d24e2fbcc1eef51bcc.
Revert "remerged confi.json temporarely"

This reverts commit ee769122fb07b570885a000e22ae4a13da1023d1.
Revert "merged from master"

This reverts commit e8d55b9452400bcefb6b66c2d2c8ee76f0ba6cd2.