Merge "Add expansion fraction to ShadeInteractor" into main