How to shuffle by album in ios

iTunes 12.7.2.58

iOS 11.2.1

In iTunes I shuffle play whole albums at a time, meaning I set it to pick albums randomly, so it goes right through the tracks on the album, in order, then picks another album at random, and goes through that in order. A lot of my music is classical and I don't want to shuffle play by tracks. Even with jazz and rock, I like to hear the whole album and not have style and mood change with every song.

This is easy to do in iTunes by putting all my music into a playlist, then using the Controls menu > Shuffle > Albums.

I just got myself an iPhone X, transferred all my music to it, and find that the Music app picks tracks at random, not albums. The Shuffle Albums setting has not carried over from iTunes, and I haven't been able to find how to set it.

If I select Albums, then shuffle, it plays a track from the middle of an album, then plays a random track from another album, which is not what you want when listening to classical music.

If I select Playlists, then the playlist 'Music for random album play' that I set up, it does the same thing.

How can I make it play whole albums, one after another in random order?

Thanks