EB-8686, EB-8778 changes related to store messages