Merge "Scale feels too quick in relation to movement" into klp-dev