merge with repo
core-4206 add metadata option to data window