Adding two files missing in last merge and reverting some code to take care of code review
comments