Merge pull request #314 from wghoffa/op-build-update_1138_5-20-2020

op-build update 5-20-2020