Merge "Fix logical vs bitwise & bug" into nextgenv2