Issue #2349015: Fixing default values
Merge branch 'Issue-2349015' into 7.x-1.x