Will contain tests for BP 3.6.3 alpha release merge features