V3 updates; level 9 improvements

Change-Id: I8a186a64538c5323dc5bf576624e631c8d14db32