Don't access the album object if it doesn't exist
Merge branch 'public/7.7' into public/7.8
Merge branch 'public/7.8' into public/7.9