Merge branch 'topic/bjorn-trivial' into next