Merge branch 'abstractj-AEROGEAR-934'
Preparing to release CR1-21022013