Merge branch 'bugfix/mediaproxy-leaks-2-electric-boogaloo' into 'develop'