* Make devices proper push based * Improve tests * Bump dependency to v21 Update fix from #35295 to use library