Function missing from the merge added again