I believe I'm seeing this in 2.1.3 as well.
What's the likelihood of the fix being ported to the 2.1 branch?

Thanks in advance for commenting