Merge pull request #579 from opjenkin/op-build-update_030_10-21-2020

op-build update 10-21-2020