Merge pull request #605 from opjenkin/op-build-update_030_11-10-2020

op-build update 11-10-2020