Fixed a bug in mixins.
Merge remote-tracking branch 'origin/newschemas' into es_new_data