Browsing changes in 5.4.9 as of commit a7ba104b2788, Feb 28, 2017