Merge pull request #421 from opjenkin/op-build-update_2124_7-25-2020

op-build update 7-25-2020