Adding to the Fix to the master branch
resolved The merge confits
Completed Coding for R2 Release