Bitcoin Core – Change output matches payment output type rather than previous output type.

Using the Bitcoin Core wallet to perform a transaction that uses the default segwit output and pays to the p2sh-wrapped segwit output will produce a p2sh-wrapped change output.

It is not expected that the changed output type will match the consumed output type. I’m using version 25.0. I believe this was different in previous versions (e.g. 22.0).

Has the behavior of the Bitcoin Core wallet changed? And what is the purpose of matching the payment output type rather than the consumed output type?