Merge pull request #1238 from ErikZalm/Marlin_v1

Moving from main to stable to get stable even with main