Updating Horizon core with recent changes

Change-Id: I3a977b3cccfcd0fd5039d0603501f8b7f08749bc