Merge "Fix resolving of slices / arrays / maps where keys need converting." into studio-1.4-dev
automerge: 73dbd04

* commit '73dbd04b293d46be9f2bb589b08aa4697a788cc3':
  Fix resolving of slices / arrays / maps where keys need converting.