prepare MP6/WP3.8 support