Fixed default value behavior
Merged
Merge branch 'dev'