backport fixes to v2_4

Backport fixes included in:

• !52 (merged)
• !50 (merged)
• !45 (merged)