merged v1.63-stackdumpfix