Merge remote-tracking branch 'origin/Entry-Meta-Consistency'