Merge "Fix reloading of configuration and meta-data changes"