Merge "Fix ODR issue in viewcompiler"