LPS-51450
LPS-51451 Message value should be removed from payload