Merge with Mindy\Core