V7Beta2 Additions

Change-Id: I5867343f39ccd8989e8a2e01b5f4ce33d8c80028