Merge branch 'sfi-base' into release