[2.x] Major performance and data handling improvements to media assets

[2.x] Major performance and data handling improvements to media assets #784