fix issue with tampered files on updates
Merge commit 'a03e2183508829e3fb60faeb8cca936ee5eaeed8' into release/2.11

* commit 'a03e2183508829e3fb60faeb8cca936ee5eaeed8':
  fix issue with tampered files on updates