Merge pull request #2216 from fabrixxm/feature-api-like