Fixed bug in saveAddShowDefaults
Merge branch 'origin/development'