Added missing returns
Merge branch '4.0'