Fix #1936: avoid patching if the target resource contains all expected fields
4 files changed