Merge "Fixed regression caused by the defaultValue feature" into stable-2.10