Hand-apply 75be314ee89fb2f4e783b4079f7fabf69e79d636 from master; fix hidden content...