[post-hoc review] fix and test vendor pull

I've merged this to develop to release a bugfix for client - please review changes to make sure nothing did slip.