[WIP] Adapted to latest changes in Discovery#56

webmozart wants to merge 1 commit intopuli:masterpuli/manager:masterfrom

webmozart:rename-config-keyswebmozart/manager:rename-config-keysCopy head branch name to clipboard