Issue #822418 by catch, marcingy, davidjdagino, no_commit_credit, tim.pl...

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