Merge "Allow more error codes on multi-padding failure" into main