Merge "Be less slow"