Return value from scope if one given.
Merge branch '4.0'