merge changes from don bugscan branch