Merge pull request #364 from opjenkin/op-build-update_169_6-20-2020

op-build update 6-20-2020