Merge branch 'refs/heads/config_only_if'

* refs/heads/config_only_if:
  Only "update resource" if required.