SD2 update
Merge branch 'master' into testing