Merge pull request #246 from wghoffa/op-build-update-3-26-2020

op-build update 3-26-2020