Commit 06 Refs #3493 edited to work w builds