Review and update pull request #188

- [ ] Merge and resolve targets custom data.