Merge pull request #599 from opjenkin/op-build-update_030_11-4-2020

op-build update 11-4-2020