Damien Murphy updated Sub-task AEROGEAR-8748