135-meta3-jen21

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