Cherry-pick !3853 (Fix incorrect calculation of rotational kinetic energy)

Cherry-pick !3853 (merged) for main as suggested here.

I'm not clear on whether/when the next merge of release-2023 into main merge occurs. If cherry-picking is not necessary, will close this.