Merge "Make it possible for subclasses to provide a different form"