Merge "Strings added to address Issue 82305" into studio-1.3-dev
automerge: 05b7588

* commit '05b75889edd66e68567d3fe10c77a8a0455ffb88':
  Strings added to address Issue 82305