Resolve #3496529 "Key value"

spokjerequested to merge
issue/drupal-3496529:3496529-key-value into 11.x

Closes #3496529

Merge request reports