Merge "Use primitive int for message mask" into main