Moving some re-org changes upstream
Merge to_actions forward to obj_render