**What is the previous behavior before this PR?** **What is the new behavior after this PR?**