Issue #811542 by bojanz, sun, mlncn, chx, pillarsdotnet, loganfsmyth, xj...

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