Merge "Fix clear_delta() function"