issue #21251: this can be back where it was
issue #21251: started adding views