Merge branch 'default_value' into 'master'