Merge pull request #312 from opjenkin/op-build-update_030_5-20-2020

op-build update 5-20-2020