Aligned with latest Marlin version

Aligned with latest marlin version.