Merge "Manually update the Resources configuration on changes" into mnc-ub-dev