Code review for PR 540 & 534

[Mani M]

Hi Admins / Committers,

Can anyone please review the PR 540 & 538, and merge the code to the
master..

With Regards
M.Mani
+61 432 461 087