Merge "Fix reload service when config updated"