backport 3.2 spec fixes