Merge "Add legacy mimetype support to BP2"