Merge pull request #640 from opjenkin/op-build-update_030_12-9-2020

op-build update 12-9-2020