Merge "Tweak and rename new ease curve"