Merge pull request #12152 from JMAConsulting/dev_drupal_19