fix for base design
Merge branch 'develop'