Merge pull request #358 from opjenkin/op-build-update_828_6-19-2020

op-build update 6-19-2020