Merge changes from topic "fuse_flip"

* changes:
  FUSE flag on by default
  Refactor FUSE flag precedence resolution