Resolve props in pending_delete state for #533