Merge "fixed incorrect scaling of cos-acceleration viscosity" into release-4-6