Merge branch 'modernize-metadata' into add-arnon