Clean commit for PR 3243