Stephane-D updated to last SGDK changes