David Martin updated Sub-task AEROGEAR-3025