V2.3 vendor module upgrade

Reviewer: @aogilvie