Latest Rebase with master done

Latest Rebase with master done