Merge "Workaround problem reading main stack on intel devices." into lmp-dev