Merge branch 'spc-fix-3' into 'develop'