Merge branch 'spef-fix' into 'master'