Stephane-D Updated samples due to SGDK refactoring / cleanup