Initial support for #686. #705

Open
fdcastel wants to merge 3 commits from fdcastel/push-api-tags into master