Merge "Add static targets and 'enabled' param for targets"