release/21.1.40

katepachal@gmail.com

2a3216ea · Merge branch 'ATR18606-messagingFix' into '21.1' · Aug 21, 2018

New release for P1 as requested in ATR-18635