Follow up on MediaCore PR