Merge branch 'bugfix/mediaproxy-leaks' into 'develop'