Merge "Converting ModelTask to an interface instead of an abstract class" into main