MAIN-2962 : Using new messaging standards