Merge bug fixes from Master into Vendor Response branch.