Browsing changes in 5.4.2.1 as of commit 8baf6a9ee621, Jun 23, 2015