further updates based on feedback from commit
Merge branch 'AEROGEAR-1228'