Please cherry pick...
https://github.com/ibm-power-utilities/powerpc-utils/commit/4fcc611a09caea70e6bca6a1275211c72ac4bb45
Please cherry pick...
https:/ /github. com/ibm- power-utilities /powerpc- utils/commit/ 4fcc611a09caea7 0e6bca6a1275211 c72ac4bb45