Rebuild table for metadata view
Merge branch 'victor.klymenko' into develop