Checkin of commit feed framework plus various fixes and refactors