The PR related to this (https://github.com/aerogear/aerogear-unifiedpush-server/pull/501) has been closed for now and will be revisted. Moving to later.