- Cleaned up the mask to be a much nicer enum definition (cherry picked from commit 66a70088f4ccdeab207a547ae019d4d2692d9f2b)
- Cleaned up the mask to be a much nicer enum definition (cherry picked from commit 66a70088f4ccdeab207a547ae019d4d2692d9f2b)