Further attempts to make this work

Committing in order to get changes from team9dev

Author: ammesonb, dbtrue