negligible changes
Merge remote branch 'remote/master'
Disabled auto attach in IS