Merge pull request #5082 from IlyaSmirnov91/ibm-release-fw1030

Revert PNOR SPD Commit