Can you fix #394311for the upcoming release?<br>