Hybrid

Change-Id: I41bcced2a56973a1f2a2a5f37003cc2d57b6f035