GMAVENPLUS-24 changes