Changes for MPL v2