Incorporating latest changes to get to stable