Merge branch 'sb/merge-friendly'