Merge "Combined motion compensation with scaled predictors" into experimental