Merge pull request #293 from opjenkin/op-build-update_1445_5-4-2020

op-build update 5-4-2020