After discussion, we agreed we should make sure that the behavior works as it did in 5.1 and prior, thus we'll implement (2).