Merge pull request #600 from opjenkin/op-build-update_030_11-5-2020

op-build update 11-5-2020