PAHMA-1009: Addl work - sanitize master