Merge "Changes in speed 2 settings"