works on U4-4769 - removing circular refs from media service