Consolidated single commit for defect branch