Merge "Part of corrections from KLP API Review: Media" into klp-dev