Sync extensions with Gerrit

Change-Id: I01b18316e80add5928b9a6f2258f858daafa7935