only remove extension if the extension_id is set
Merge branch 'user_line_13.24'