Merge "Manually update the Resources configuration on changes" into mnc-ub-dev am: 59b0f66fd8
am: b07338e8eb

* commit 'b07338e8eb56c436355531981c87b6eff114c5bf':
  Manually update the Resources configuration on changes