Updating files which was missed during merge from 'recovery' branch.