Merge pull request #224 from opjenkin/op-build-update_040_3-12-2020

op-build update 3-12-2020