resend pr for bug 948826
Merge pull request #15625 from altsai/bug948826-2

resend pr for bug 948826