Merge branch 'gp/hppa-stack-test-fix'