merged jatins commit