Merge branch 'backport/fsi' into snapshot