Merge pull request #832 from wghoffa/p9_fixes

P9 Zaius Fixes