Merge "Small refactor to remove unecessary inheritance" into main