@semaperepelitsa I agree the behaviour is undesirable, I just don't know if cherry-picking this individual fix out from all the other "fixes" we applied since 3.2 is a good idea.