Horizon compatibility with Grizzly

Change-Id: Ia1c02e72bd49a9275b7544ff2bdd94e6bac876a8