V7.0 here we go!!!

Change-Id: I1ca8f6bb8777a7db7ef37f9d899a53d0bb7f67ef