notbugAs an Amazon Associate I earn from qualifying purchases.
Want a good read? Try FreeBSD Mastery: Jails (IT Mastery Book 15)
Want a good monitor light? See my photosAll times are UTC
Ukraine
This referral link gives you 10% off a Fastmail.com account and gives me a discount on my Fastmail account.

Get notified when packages are built

A new feature has been added. FreshPorts already tracks package built by the FreeBSD project. This information is displayed on each port page. You can now get an email when FreshPorts notices a new package is available for something on one of your watch lists. However, you must opt into that. Click on Report Subscriptions on the right, and New Package Notification box, and click on Update.

Finally, under Watch Lists, click on ABI Package Subscriptions to select your ABI (e.g. FreeBSD:14:amd64) & package set (latest/quarterly) combination for a given watch list. This is what FreshPorts will look for.

Port details on branch 2024Q2
freerdp Free implementation of Remote Desktop Protocol
2.11.7 net on this many watch lists=0 search for ports that depend on this port Find issues related to this port Report an issue related to this port View this port on Repology. pkg-fallout 2.11.7Version of this port present on the latest quarterly branch.
Maintainer: vvd@FreeBSD.org search for ports maintained by this maintainer
Port Added: 2024-04-18 21:54:07
Last Update: 2024-04-22 15:38:10
Commit Hash: 074b333
Also Listed In: comms wayland
License: APACHE20
WWW:
https://www.freerdp.com/
Description:
FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache license. Enjoy the freedom of using your software wherever you want, the way you want it, in a world where interoperability can finally liberate your computing experience.
Homepage    cgit ¦ Codeberg ¦ GitHub ¦ GitLab ¦ SVNWeb - no subversion history for this port

Manual pages:
FreshPorts has no man page information for this port.
pkg-plist: as obtained via: make generate-plist
Expand this list (273 items)
Collapse this list.
  1. @ldconfig
  2. /usr/local/share/licenses/freerdp-2.11.7/catalog.mk
  3. /usr/local/share/licenses/freerdp-2.11.7/LICENSE
  4. /usr/local/share/licenses/freerdp-2.11.7/APACHE20
  5. bin/winpr-hash
  6. bin/winpr-makecert
  7. bin/wlfreerdp
  8. bin/xfreerdp
  9. include/freerdp2/freerdp/addin.h
  10. include/freerdp2/freerdp/altsec.h
  11. include/freerdp2/freerdp/api.h
  12. include/freerdp2/freerdp/assistance.h
  13. include/freerdp2/freerdp/autodetect.h
  14. include/freerdp2/freerdp/build-config.h
  15. include/freerdp2/freerdp/cache/bitmap.h
  16. include/freerdp2/freerdp/cache/brush.h
  17. include/freerdp2/freerdp/cache/cache.h
  18. include/freerdp2/freerdp/cache/glyph.h
  19. include/freerdp2/freerdp/cache/nine_grid.h
  20. include/freerdp2/freerdp/cache/offscreen.h
  21. include/freerdp2/freerdp/cache/palette.h
  22. include/freerdp2/freerdp/cache/pointer.h
  23. include/freerdp2/freerdp/channels/ainput.h
  24. include/freerdp2/freerdp/channels/audin.h
  25. include/freerdp2/freerdp/channels/channels.h
  26. include/freerdp2/freerdp/channels/cliprdr.h
  27. include/freerdp2/freerdp/channels/disp.h
  28. include/freerdp2/freerdp/channels/echo.h
  29. include/freerdp2/freerdp/channels/encomsp.h
  30. include/freerdp2/freerdp/channels/geometry.h
  31. include/freerdp2/freerdp/channels/log.h
  32. include/freerdp2/freerdp/channels/rail.h
  33. include/freerdp2/freerdp/channels/rdpdr.h
  34. include/freerdp2/freerdp/channels/rdpecam.h
  35. include/freerdp2/freerdp/channels/rdpei.h
  36. include/freerdp2/freerdp/channels/rdpgfx.h
  37. include/freerdp2/freerdp/channels/rdpsnd.h
  38. include/freerdp2/freerdp/channels/remdesk.h
  39. include/freerdp2/freerdp/channels/telemetry.h
  40. include/freerdp2/freerdp/channels/tsmf.h
  41. include/freerdp2/freerdp/channels/urbdrc.h
  42. include/freerdp2/freerdp/channels/video.h
  43. include/freerdp2/freerdp/channels/wtsvc.h
  44. include/freerdp2/freerdp/client.h
  45. include/freerdp2/freerdp/client/ainput.h
  46. include/freerdp2/freerdp/client/audin.h
  47. include/freerdp2/freerdp/client/channels.h
  48. include/freerdp2/freerdp/client/cliprdr.h
  49. include/freerdp2/freerdp/client/cmdline.h
  50. include/freerdp2/freerdp/client/disp.h
  51. include/freerdp2/freerdp/client/drdynvc.h
  52. include/freerdp2/freerdp/client/encomsp.h
  53. include/freerdp2/freerdp/client/file.h
  54. include/freerdp2/freerdp/client/geometry.h
  55. include/freerdp2/freerdp/client/printer.h
  56. include/freerdp2/freerdp/client/rail.h
  57. include/freerdp2/freerdp/client/rdpei.h
  58. include/freerdp2/freerdp/client/rdpgfx.h
  59. include/freerdp2/freerdp/client/rdpsnd.h
  60. include/freerdp2/freerdp/client/remdesk.h
  61. include/freerdp2/freerdp/client/sshagent.h
  62. include/freerdp2/freerdp/client/tsmf.h
  63. include/freerdp2/freerdp/client/video.h
  64. include/freerdp2/freerdp/codec/audio.h
  65. include/freerdp2/freerdp/codec/bitmap.h
  66. include/freerdp2/freerdp/codec/bulk.h
  67. include/freerdp2/freerdp/codec/clear.h
  68. include/freerdp2/freerdp/codec/color.h
  69. include/freerdp2/freerdp/codec/dsp.h
  70. include/freerdp2/freerdp/codec/h264.h
  71. include/freerdp2/freerdp/codec/interleaved.h
  72. include/freerdp2/freerdp/codec/jpeg.h
  73. include/freerdp2/freerdp/codec/mppc.h
  74. include/freerdp2/freerdp/codec/ncrush.h
  75. include/freerdp2/freerdp/codec/nsc.h
  76. include/freerdp2/freerdp/codec/planar.h
  77. include/freerdp2/freerdp/codec/progressive.h
  78. include/freerdp2/freerdp/codec/region.h
  79. include/freerdp2/freerdp/codec/rfx.h
  80. include/freerdp2/freerdp/codec/xcrush.h
  81. include/freerdp2/freerdp/codec/yuv.h
  82. include/freerdp2/freerdp/codec/zgfx.h
  83. include/freerdp2/freerdp/codecs.h
  84. include/freerdp2/freerdp/constants.h
  85. include/freerdp2/freerdp/crypto/ber.h
  86. include/freerdp2/freerdp/crypto/certificate.h
  87. include/freerdp2/freerdp/crypto/crypto.h
  88. include/freerdp2/freerdp/crypto/der.h
  89. include/freerdp2/freerdp/crypto/er.h
  90. include/freerdp2/freerdp/crypto/per.h
  91. include/freerdp2/freerdp/crypto/tls.h
  92. include/freerdp2/freerdp/display.h
  93. include/freerdp2/freerdp/dvc.h
  94. include/freerdp2/freerdp/error.h
  95. include/freerdp2/freerdp/event.h
  96. include/freerdp2/freerdp/extension.h
  97. include/freerdp2/freerdp/freerdp.h
  98. include/freerdp2/freerdp/gdi/bitmap.h
  99. include/freerdp2/freerdp/gdi/dc.h
  100. include/freerdp2/freerdp/gdi/gdi.h
  101. include/freerdp2/freerdp/gdi/gfx.h
  102. include/freerdp2/freerdp/gdi/pen.h
  103. include/freerdp2/freerdp/gdi/region.h
  104. include/freerdp2/freerdp/gdi/shape.h
  105. include/freerdp2/freerdp/gdi/video.h
  106. include/freerdp2/freerdp/graphics.h
  107. include/freerdp2/freerdp/heartbeat.h
  108. include/freerdp2/freerdp/input.h
  109. include/freerdp2/freerdp/license.h
  110. include/freerdp2/freerdp/listener.h
  111. include/freerdp2/freerdp/locale/keyboard.h
  112. include/freerdp2/freerdp/locale/locale.h
  113. include/freerdp2/freerdp/log.h
  114. include/freerdp2/freerdp/message.h
  115. include/freerdp2/freerdp/metrics.h
  116. include/freerdp2/freerdp/peer.h
  117. include/freerdp2/freerdp/pointer.h
  118. include/freerdp2/freerdp/primary.h
  119. include/freerdp2/freerdp/primitives.h
  120. include/freerdp2/freerdp/rail.h
  121. include/freerdp2/freerdp/scancode.h
  122. include/freerdp2/freerdp/secondary.h
  123. include/freerdp2/freerdp/server/ainput.h
  124. include/freerdp2/freerdp/server/audin.h
  125. include/freerdp2/freerdp/server/channels.h
  126. include/freerdp2/freerdp/server/cliprdr.h
  127. include/freerdp2/freerdp/server/disp.h
  128. include/freerdp2/freerdp/server/drdynvc.h
  129. include/freerdp2/freerdp/server/echo.h
  130. include/freerdp2/freerdp/server/encomsp.h
  131. include/freerdp2/freerdp/server/rail.h
  132. include/freerdp2/freerdp/server/rdpdr.h
  133. include/freerdp2/freerdp/server/rdpecam-enumerator.h
  134. include/freerdp2/freerdp/server/rdpecam.h
  135. include/freerdp2/freerdp/server/rdpei.h
  136. include/freerdp2/freerdp/server/rdpgfx.h
  137. include/freerdp2/freerdp/server/rdpsnd.h
  138. include/freerdp2/freerdp/server/remdesk.h
  139. include/freerdp2/freerdp/server/server-common.h
  140. include/freerdp2/freerdp/server/shadow.h
  141. include/freerdp2/freerdp/server/telemetry.h
  142. include/freerdp2/freerdp/session.h
  143. include/freerdp2/freerdp/settings.h
  144. include/freerdp2/freerdp/svc.h
  145. include/freerdp2/freerdp/types.h
  146. include/freerdp2/freerdp/update.h
  147. include/freerdp2/freerdp/utils/cliprdr_utils.h
  148. include/freerdp2/freerdp/utils/passphrase.h
  149. include/freerdp2/freerdp/utils/pcap.h
  150. include/freerdp2/freerdp/utils/profiler.h
  151. include/freerdp2/freerdp/utils/ringbuffer.h
  152. include/freerdp2/freerdp/utils/signal.h
  153. include/freerdp2/freerdp/utils/stopwatch.h
  154. include/freerdp2/freerdp/utils/string.h
  155. include/freerdp2/freerdp/version.h
  156. include/freerdp2/freerdp/window.h
  157. include/uwac0/uwac/uwac-tools.h
  158. include/uwac0/uwac/uwac.h
  159. include/winpr2/winpr/asn1.h
  160. include/winpr2/winpr/assert.h
  161. include/winpr2/winpr/bcrypt.h
  162. include/winpr2/winpr/bitstream.h
  163. include/winpr2/winpr/clipboard.h
  164. include/winpr2/winpr/cmdline.h
  165. include/winpr2/winpr/collections.h
  166. include/winpr2/winpr/comm.h
  167. include/winpr2/winpr/credentials.h
  168. include/winpr2/winpr/credui.h
  169. include/winpr2/winpr/crt.h
  170. include/winpr2/winpr/crypto.h
  171. include/winpr2/winpr/custom-crypto.h
  172. include/winpr2/winpr/debug.h
  173. include/winpr2/winpr/dsparse.h
  174. include/winpr2/winpr/endian.h
  175. include/winpr2/winpr/environment.h
  176. include/winpr2/winpr/error.h
  177. include/winpr2/winpr/file.h
  178. include/winpr2/winpr/handle.h
  179. include/winpr2/winpr/heap.h
  180. include/winpr2/winpr/image.h
  181. include/winpr2/winpr/ini.h
  182. include/winpr2/winpr/input.h
  183. include/winpr2/winpr/interlocked.h
  184. include/winpr2/winpr/intrin.h
  185. include/winpr2/winpr/io.h
  186. include/winpr2/winpr/library.h
  187. include/winpr2/winpr/locale.h
  188. include/winpr2/winpr/memory.h
  189. include/winpr2/winpr/midl.h
  190. include/winpr2/winpr/ndr.h
  191. include/winpr2/winpr/nt.h
  192. include/winpr2/winpr/ntlm.h
  193. include/winpr2/winpr/pack.h
  194. include/winpr2/winpr/path.h
  195. include/winpr2/winpr/pipe.h
  196. include/winpr2/winpr/platform.h
  197. include/winpr2/winpr/pool.h
  198. include/winpr2/winpr/print.h
  199. include/winpr2/winpr/registry.h
  200. include/winpr2/winpr/rpc.h
  201. include/winpr2/winpr/sam.h
  202. include/winpr2/winpr/schannel.h
  203. include/winpr2/winpr/security.h
  204. include/winpr2/winpr/shell.h
  205. include/winpr2/winpr/smartcard.h
  206. include/winpr2/winpr/spec.h
  207. include/winpr2/winpr/ssl.h
  208. include/winpr2/winpr/sspi.h
  209. include/winpr2/winpr/sspicli.h
  210. include/winpr2/winpr/stream.h
  211. include/winpr2/winpr/string.h
  212. include/winpr2/winpr/strlst.h
  213. include/winpr2/winpr/synch.h
  214. include/winpr2/winpr/sysinfo.h
  215. include/winpr2/winpr/tchar.h
  216. include/winpr2/winpr/thread.h
  217. include/winpr2/winpr/timezone.h
  218. include/winpr2/winpr/tools/makecert.h
  219. include/winpr2/winpr/user.h
  220. include/winpr2/winpr/version.h
  221. include/winpr2/winpr/wincrypt.h
  222. include/winpr2/winpr/windows.h
  223. include/winpr2/winpr/winhttp.h
  224. include/winpr2/winpr/winpr.h
  225. include/winpr2/winpr/winsock.h
  226. include/winpr2/winpr/wlog.h
  227. include/winpr2/winpr/wnd.h
  228. include/winpr2/winpr/wtsapi.h
  229. include/winpr2/winpr/wtypes.h
  230. lib/libfreerdp-client2.so
  231. lib/libfreerdp-client2.so.2
  232. lib/libfreerdp-client2.so.2.11.7
  233. lib/libfreerdp2.so
  234. lib/libfreerdp2.so.2
  235. lib/libfreerdp2.so.2.11.7
  236. lib/libuwac0.so
  237. lib/libuwac0.so.0
  238. lib/libuwac0.so.0.2.0
  239. lib/libwinpr-tools2.so
  240. lib/libwinpr-tools2.so.2
  241. lib/libwinpr-tools2.so.2.11.7
  242. lib/libwinpr2.so
  243. lib/libwinpr2.so.2
  244. lib/libwinpr2.so.2.11.7
  245. libdata/pkgconfig/freerdp-client2.pc
  246. libdata/pkgconfig/freerdp2.pc
  247. libdata/pkgconfig/uwac0.pc
  248. libdata/pkgconfig/winpr-tools2.pc
  249. libdata/pkgconfig/winpr2.pc
  250. share/man/man1/winpr-hash.1.gz
  251. share/man/man1/winpr-makecert.1.gz
  252. share/man/man1/wlfreerdp.1.gz
  253. share/man/man1/xfreerdp.1.gz
  254. share/man/man7/wlog.7.gz
  255. share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfig.cmake
  256. share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientConfigVersion.cmake
  257. share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets-release.cmake
  258. share/cmake/Modules/FreeRDP-Client2/FreeRDP-ClientTargets.cmake
  259. share/cmake/Modules/FreeRDP2/FreeRDPConfig.cmake
  260. share/cmake/Modules/FreeRDP2/FreeRDPConfigVersion.cmake
  261. share/cmake/Modules/FreeRDP2/FreeRDPTargets-release.cmake
  262. share/cmake/Modules/FreeRDP2/FreeRDPTargets.cmake
  263. share/cmake/Modules/WinPR2/WinPRConfig.cmake
  264. share/cmake/Modules/WinPR2/WinPRConfigVersion.cmake
  265. share/cmake/Modules/WinPR2/WinPRTargets-release.cmake
  266. share/cmake/Modules/WinPR2/WinPRTargets.cmake
  267. share/cmake/Modules/uwac0/uwac-release.cmake
  268. share/cmake/Modules/uwac0/uwac.cmake
  269. share/cmake/Modules/uwac0/uwacConfig.cmake
  270. share/cmake/Modules/uwac0/uwacConfigVersion.cmake
  271. @owner
  272. @group
  273. @mode
Collapse this list.
Dependency lines:
  • freerdp>0:net/freerdp
To install the port:
cd /usr/ports/net/freerdp/ && make install clean
To add the package, run one of these commands:
  • pkg install net/freerdp
  • pkg install freerdp
NOTE: If this package has multiple flavors (see below), then use one of them instead of the name specified above.
PKGNAME: freerdp
Flavors: there is no flavor information for this port.
distinfo:
TIMESTAMP = 1713795208 SHA256 (freerdp-2.11.7.tar.gz) = 5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3 SIZE (freerdp-2.11.7.tar.gz) = 7337520

Expand this list (4 items)

Collapse this list.

SHA256 (61983cd6dcb86097d91b7ef405abc1266444a368.patch) = be68ff4ab63c15592ff576af34d4592340b70e7b6d7b5ef3cfe5ba97b5fdccf2 SIZE (61983cd6dcb86097d91b7ef405abc1266444a368.patch) = 2826 SHA256 (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = d49ea1c5a0fdb644b32fd61479dfca6770c0bb6446bbe9d274e5ae4f62f0a00b SIZE (78cdb555c57c33b7f331cb280ac2f615cb87fa74.patch) = 966

Collapse this list.


No package information for this port in our database
Sometimes this happens. Not all ports have packages.
Dependencies
NOTE: FreshPorts displays only information on required and default dependencies. Optional dependencies are not covered.
Build dependencies:
  1. xmlto : textproc/xmlto
  2. input.h : devel/evdev-proto
  3. cmake : devel/cmake-core
  4. ninja : devel/ninja
  5. pkgconf>=1.3.0_1 : devel/pkgconf
  6. gettext-runtime>=0.22_1 : devel/gettext-runtime
  7. msgfmt : devel/gettext-tools
  8. gstreamer1-plugins>=1.22.10 : multimedia/gstreamer1-plugins
  9. xorgproto>=0 : x11/xorgproto
  10. xorgproto>=0 : x11/xorgproto
  11. x11.pc : x11/libX11
  12. xext.pc : x11/libXext
  13. xrandr.pc : x11/libXrandr
  14. x11.pc : x11/libX11
  15. xcursor.pc : x11/libXcursor
  16. xext.pc : x11/libXext
  17. xfixes.pc : x11/libXfixes
  18. xi.pc : x11/libXi
  19. xinerama.pc : x11/libXinerama
  20. xkbfile.pc : x11/libxkbfile
  21. xrandr.pc : x11/libXrandr
  22. xrender.pc : x11/libXrender
  23. xv.pc : x11/libXv
Runtime dependencies:
  1. gstreamer1-plugins>=1.22.10 : multimedia/gstreamer1-plugins
  2. x11.pc : x11/libX11
  3. xext.pc : x11/libXext
  4. xrandr.pc : x11/libXrandr
  5. x11.pc : x11/libX11
  6. xcursor.pc : x11/libXcursor
  7. xext.pc : x11/libXext
  8. xfixes.pc : x11/libXfixes
  9. xi.pc : x11/libXi
  10. xinerama.pc : x11/libXinerama
  11. xkbfile.pc : x11/libxkbfile
  12. xrandr.pc : x11/libXrandr
  13. xrender.pc : x11/libXrender
  14. xv.pc : x11/libXv
Library dependencies:
  1. libepoll-shim.so : devel/libepoll-shim
  2. libcups.so : print/cups
  3. libgstbase-1.0.so : multimedia/gstreamer1
  4. libicuuc.so : devel/icu
  5. libswscale.so : multimedia/ffmpeg
  6. libwayland-client.so : graphics/wayland
  7. libwayland-cursor.so : graphics/wayland
  8. libxkbcommon.so : x11/libxkbcommon
  9. libintl.so : devel/gettext-runtime
  10. libglib-2.0.so : devel/glib20
  11. libintl.so : devel/gettext-runtime
  12. libgstreamer-1.0.so : multimedia/gstreamer1
There are no ports dependent upon this port

Configuration Options:
===> The following configuration options are available for freerdp-2.11.7: ALSA=off: ALSA audio architecture support BROKENFOCUS=off: Work around focus bug in some WMs (PR #254908) CUPS=on: CUPS printing system support FAAC=off: FAAC AAC encoder support FAAD=off: FAAD AAC decoder support FFMPEG=off: FFmpeg support (WMA, AIFF, AC3, APE...) GSM=off: GSM codec support GSTREAMER=on: Multimedia support via GStreamer ICU=on: Unicode support via ICU JPEG=off: JPEG image format support LAME=off: LAME MP3 audio encoder support MANPAGES=on: Build and/or install manual pages OPENH264=off: H.264 video codec support via OpenH264 PCSC=off: Smart card support (smart card device redirection) PULSEAUDIO=off: PulseAudio sound server support SOXR=off: SoX resampler support via libsoxr SSE=on: Use SSE optimized routines WAYLAND=on: Build FreeRDP Wayland client X11=on: Build FreeRDP X11 client ====> Options available for the radio SCALE: you can only select none or one of them CAIRO=off: Use CAIRO image library for screen resizing SWSCALE=on: Use SWScale image library for screen resizing (recommended) ===> Use 'make config' to modify these settings
Options name:
net_freerdp
USES:
alias cmake compiler:c++11-lib cpe localbase pathfix pkgconfig ssl gettext gnome gstreamer xorg xorg
FreshPorts was unable to extract/find any pkg message
Master Sites:
Expand this list (2 items)
Collapse this list.
  1. https://github.com/FreeRDP/FreeRDP/releases/download/2.11.7/
  2. https://pub.freerdp.com/releases/
Collapse this list.

Number of commits found: 2

Commit History - (may be incomplete: for full details, see links to repositories near top of page)
CommitCreditsLog message
2.11.7
22 Apr 2024 15:38:10
commit hash: 074b3337b2e660a4ba59a82d9726ade8dbb0a1a5commit hash: 074b3337b2e660a4ba59a82d9726ade8dbb0a1a5commit hash: 074b3337b2e660a4ba59a82d9726ade8dbb0a1a5commit hash: 074b3337b2e660a4ba59a82d9726ade8dbb0a1a5 files touched by this commit
Vladimir Druzenko (vvd) search for other commits by this committer
net/freerdp: update to 2.11.7

Bugfix release.
Changelog:
https://github.com/FreeRDP/FreeRDP/releases/tag/2.11.7

Approved by:	arrowd (mentor, implicit)
MFH:		2024Q2

(cherry picked from commit a2ddcd0e35db9c2d52c2e80598fc11e306606464)
2.11.6
18 Apr 2024 21:53:13
commit hash: 21b1b6ff90c3c17cf455fffbe875a9baf040597ecommit hash: 21b1b6ff90c3c17cf455fffbe875a9baf040597ecommit hash: 21b1b6ff90c3c17cf455fffbe875a9baf040597ecommit hash: 21b1b6ff90c3c17cf455fffbe875a9baf040597e files touched by this commit
Vladimir Druzenko (vvd) search for other commits by this committer
net/freerdp: update to 2.11.6 with 6 CVEs fixed

Changelog:
https://github.com/FreeRDP/FreeRDP/releases/tag/2.11.6

CVE:
CVE-2024-32041 [Low[ OutOfBound Read in zgfx_decompress_segment
CVE-2024-32039 [Moderate] Integer overflow & OutOfBound Write in
clear_decompress_residual_data
CVE-2024-32040 [Low] integer underflow in nsc_rle_decode
CVE-2024-32458 [Low] OutOfBound Read in planar_skip_plane_rle
CVE-2024-32459 [Low] OutOfBound Read in ncrush_decompress
CVE-2024-32460 [Low] OutOfBound Read in interleaved_decompress

Approved by:	arrowd (mentor, implicit)
MFH:		2024Q2

(cherry picked from commit 78ae5b8b3407d78026445efdc53ab6a8c37b6622)

Number of commits found: 2