Merge pull request #366 from opjenkin/op-build-update_030_6-23-2020

op-build update 6-23-2020