Merge pull request #340 from opjenkin/op-build-update_840_6-10-2020

op-build update 6-10-2020