merge Issue #3278809 by joseph.olstad: safedelete link improvement for media , usability improvements