Merge "Fix signature of recently changed methods"