Branch Mantle

Change-Id: I8c9fa89a506ce7a5ab830b22ad4836ff9cf1e150