Merge "Clean up vendor image handling"