I could be totally wrong here, but I’m pretty sure that those are two different problems. Maybe they were similar enough to be put together? I’m definitely still encountering the problem in core 14.0.25.4.
Maybe the changes from 14.0.25.2 caused the problem?