Worked the patches in the new codebase ticket no: 18003

Applied the patch diff, for the new code base.