Merge pull request #408 from opjenkin/op-build-update_030_7-21-2020

op-build update 7-21-2020