Added default value option for yield method.
Merge branch '4.0'