Merge pull request #373 from opjenkin/op-build-update_137_6-29-2020

op-build update 6-29-2020