scope stuff
Merge branch 'master' into generic