Merge "Implement class-pre-define time redefinition."