Merge pull request #8650 from neheb/zab2