am 1dd6936a: Merge change 8728 into donut

Merge commit '1dd6936a862be97efca02e4b7582a9fca1fcc269'

* commit '1dd6936a862be97efca02e4b7582a9fca1fcc269':
  Fix resource code and version attributes