Merge "Update dynamic configuration info"