Naive designs fixed
Merge branch 'fix/naive-designs' into release/1.0