am 0bceb77b: Merge change 4669 into donut

Merge commit '0bceb77b004a688ca044b794e0622385c6e2953d'

* commit '0bceb77b004a688ca044b794e0622385c6e2953d':
  Fixes #1922373. Resolves a case of keys collision in Resources' cache.