Merge branch 'jn/merge-custom-no-trivial'