small feature-branch fork of official MPL