We can use mw-core REL1_23 branch again now