Resolve #3240792 "Lullabot on top of 3407834"

Alex Pottrequested to merge
issue/drupal-2561915:3240792-lullabot-on-top-of-3407834 into 11.x

Closes #3240792

Merge request reports