Enable non-strict daemon config file
Merge develop