Merge "Refactor CasField32"