EB-8390 EB-8757 Store message related changes