Issue #1015946 by pillarsdotnet, catch, bfroehle, Jej, jose.guevara, Dam...

PR for https://github.com/backdrop/backdrop-issues/issues/135