[PATCH v2 0/129] MR7098: Draft: Fighting with tests for 9.0.1