Closing this as a duplicate of AEROGEAR-9009, just so that I've got a 1:1 mapping of issue -> pull request.