v3.60

Change-Id: I1bc28760ede3d1575bf01fc73ff52c7ffe1fb2cf