Issue #8140 by tj: Added weight