Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
Merge remote-tracking branch 'XTUPLE/master'
updated for issue #20259
updated for issue #20330
Merge pull request #373 from vinaysingu/master

Updated for issues #20259 and #20330