Merge pull request #1656 from kev009/target_set_add_meta