Merge "Bug fixes in Recents"