Merge pull request #6048 from PawanMeh/fixes_5723

[fix] #5723