Issue #1054162 by tim.plunkett, Dave Reid, joachim, no_commit_credit, Be...

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