Merge pull request #571 from opjenkin/op-build-update_927_10-15-2020

op-build update 10-15-2020