Merging cherry pick commit