Feature/gm2 5 -- pull changes necessary for gm2 v5_00_00