Changes for featureA2
Merge branch 'featureA2' into develop