Default value fix
Merge origin/master