Merge "Convert ShadeInteractor to interface" into main