[WO-751] Add flagging messages