Integrated the fix for the editor pod add-link issue.