The fix for [3610404] leads to a simplification in the implementation of
forward methods.
merge trunk