adopt to new cross-configuration