ciaran roche started work on Feature Request AEROGEAR-7703