PLFENG-1805: improvement on message commit based on SL3's requirements