Merge pull request #416 from opjenkin/op-build-update_2034_7-23-2020

op-build update 7-23-2020