Part of #5423 * Support new metadata fields in check_consistent
See discussion in #2491 Co-authored-by: Ivan Levkivskyi <ilevkivskyi@dropbox.com>