Merge "implement delete and related unittest"