Merge "Make the backward updates work with bitshifts" into nextgenv2