Correction
Leave blog open for now and fix includes in SC plugin
Merge branch 'refs/heads/2.3/develop' into 3.0/develop