Second merge from waqas