Merge branch 'xx/disable-replace-when-building-midx'