Merge pull request #329 from opjenkin/op-build-update_718_6-3-2020

op-build update 6-3-2020