2.7-wip branch

Change-Id: I6b8044f04ba4a9a3a401d376c07580639c69dfec