Merge branch fixing commit lags