Fixed problem hanging on media endpoint browse
Merge and fix warnings
Fixed unit test