223/biolithic merge

PR for https://github.com/backdrop/backdrop-issues/issues/222

This PR replaces https://github.com/backdrop/backdrop/pull/223, which had some issue with it's merging.