Hi Chris,
Thank you for this.
I don't remember it as in your photo, and I expect several others will.
Interesting photo, it makes me think of a sort of mix and match between the 2 - entrance as you say, in a way, like the Caronia, as it was till November 2008 ('tears still rolling'), combined with the sort of partial room dividers of the Mauritania - looks very elegant doesn't it!
( trying to send a photo - not sure whether it'll manage to make the journey!)