Merge upstream 22-02

Also moved accessor method get_redirect_url next to its attribute url
for consistency with the other views.

Thanks nikunj.sg for the report