Task #1629 - fixing METASTORE