https://backlog.acquia.com/browse/CH-1268