Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev