Merge branch 'AEROGEAR-732'