Cherry picked required bug fix: all view joins were missing the view name.