Merge pull request #405 from opjenkin/op-build-update_1232_7-20-2020

op-build update 7-20-2020