do not allow for default association value to become string
Merge branch 'develop'