This MR is intended for experimenting with ideas in #234 (closed) and not a direct candidate for merge.