Daniel Passos started work on Feature Request AEROGEAR-9557