Merge pull request #776 from mmicko/unify_noflatten