pulling in changes from latest engine commit (splitting conf and vars)