Improve method signatures to match broader scenarios.
Merge remote-tracking branch 'origin/master'