flax

daff4030 - Merge pull request #335 from jheek:omnistaging-fixes