map views tracked using windshaft CDB-933
updated torque
fixed CDB-933
merged with upstream