Initial xbus compatibility mode commit