Merge pull request #567 from opjenkin/op-build-update_030_10-14-2020

op-build update 10-14-2020