Merge "add capability to filter modules by metadata field" into oc-dev