MR from @vergaral patch to fix issue reported by @homsrego and @vergaral relative to the bliss_dev env.