This is commit from CCM Ritesh branch