What does this PR do? Checklist before merging I have properly formatted metadata files (see CONTRIBUTING document) I have added thorough tests. (see this)