Make render_model hvad-aware

Fix #2602
Fix #2914