Merge "MCR database schema"