Merge "Fix the stack decoder." into main