Merger from Manish-Repo