fix for #15585
Merge pull request #15775 from avdhoot/develop

fix for #15585