Scite user properties
Scite user properties
Merge branch 'master' into edge