Merge pull request #337 from opjenkin/op-build-update_1137_6-9-2020

op-build update 6-9-2020