modify to handle new mohair capabilities
Merge branch 'insertFromSelectQuery' into latest