Merge "Fix for invalid read of data below stack pointer"