Merge "Don't use new MCR schema without using DB"