Merge pull request #281 from opjenkin/op-build-update_923_4-23-2020

op-build update 4-23-2020