Merge "spmi: Add del_controller functionality"