Port log base squashed

supersedes !452 (closed) which erroneously was branched off of a previous feature branch.

This one also adds regression tests.