Merge pull request #268 from opjenkin/op-build-update_1556_4-14-2020

op-build update 4-14-2020