Merge "Force usage of MCR aware database schema"