Merge pull request #444 from opjenkin/op-build-update_1636_8-9-2020

op-build update 8-9-2020