Merge "Refactor requestRefreshConfiguration call"