Merge "Added predictor stride argument(s) to subtract functions"