Merge pull request #563 from opjenkin/op-build-update_030_10-12-2020

op-build update 10-12-2020