Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| \| * \|	Doc: removed assistant style and reintroduced the index page icons.	Morten Engvoldsen	2010-08-16	2	-41/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 2dfd16e8a138da9d903b31ef461331016d16ec5b)
\| \| \| \| * \|	qdoc: All references to -assistant and -base were removed.	Martin Smith	2010-08-13	4	-30/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flags allowed are now -creator and -online. -creator is the default. (cherry picked from commit 03d9d3cf641c8dde22a903870ac2b6e58ada6eec)
\| \| \| \| * \|	qdoc: added application flags in doc.pri and fixed QTBUG-12388	Martin Smith	2010-08-13	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-nr: QTBUG-12388 (cherry picked from commit c1ce7b4b01c1049c61881bb7d701ed68b92a401b)
\| \| \| \| * \|	Properly emit geometryChanged() when the position change.	Alexis Menard	2010-08-13	2	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also emit the signal at the very end, so people can rely on the resize event to adjust some stuff in their item. Reviewed-by:yoann (cherry picked from commit 3ee89bc0830f69d44f272eff5a0c886bff33c92e)
\| \| \| \| * \|	QAudioOutput(ALSA); Fix check for available devices.	Justin McPherson	2010-08-13	1	-14/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ALSA can return a list of one empty item when no devices are available. Task-number: QTBUG-12690 Reviewed-by: Andrew den Exter (cherry picked from commit baf8eabd2c647d6ba2bf0a9dc5103f4726808c3d)
\| \| \| \| * \|	Doc: fixing examples link	Morten Engvoldsen	2010-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 653f180d4697e0c7ec1c58022622d5d140e7fda8)
\| \| \| \| * \|	Make bld.inf target in Symbian mkspecs to depend on .pro file	Miikka Heikkinen	2010-08-13	2	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes to .pro file weren't previously noticed and therefore qmake wasn't rerun. Qmake command itself was also incorrect. Task-number: QTBUG-12716 Reviewed-by: Shane Kearns (cherry picked from commit 142ce4d38094f1588b04758a6f9ff6787a784fe3)
\| \| \| \| * \|	Gcce building support for symbian-sbsv2	Miikka Heikkinen	2010-08-13	4	-41/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is now possible to use "release-gcce" and "debug-gcce" targets in symbian-sbsv2 mkspec. Exports and cleans should also now work properly for all target platforms under symbian-sbsv2. Task-number: QTBUG-12762 Reviewed-by: Jason Barron (cherry picked from commit bdfbedf971f3e9ef99977652308b9e2b1c213210)
\| \| \| \| * \|	Added files that had been renamed.	Kevin Wright	2010-08-12	28	-0/+1605
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit a98af1c7f1bba3c791d08e76e4896e48ea6ea019)
\| \| \| \| * \|	qdoc: Added list of all members (including inherited) page to QML elements.	Martin Smith	2010-08-12	8	-24/+113
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 62968f33452016b31020e524fa6ba6d2cefd0278)
\| \| \| \| * \|	doc: The QML Qt element was missing from the documentation.	Martin Smith	2010-08-12	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Either someone removed the QML: prefix, or it was never there. (cherry picked from commit a4d19eef86b07d670b8b2a3f9ad6b3448800bae5)
\| \| \| \| * \|	Disable minRightBearing optimization in QTextLayout on Mac	Eskil Abrahamsen Blomfeldt	2010-08-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Neither of the Mac font engines have implemented minimum right bearing, which will cause them to return 0 for the minimum value. This will cause the right bearing to never be calculated prior to breaking and thus never be a part of the breaking width. Since actually implementing the functions is too time consuming for right now, we will disable the optimization for the time being. Reviewed-by: Olivier (cherry picked from commit bb696453f6f87cad58982af3455335478fedb8cc)
\| \| \| \| * \|	Fix scrollbar randomly popping up in QPlainTextEdit	Eskil Abrahamsen Blomfeldt	2010-08-12	2	-4/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a line break was detected, we would retain the value of the right bearing for the character after the break instead of resetting it to the right bearing of the previous value. This could in some cases cause the bounding rect of the text to be wrong, and could cause unnecessary horizontal scrollbars to pop up. It was especially visible when using WrapAnywhere. Visible e.g. in the compile output in Creator. Done-by: mae Reviewed-by: Eskil Reviewed-by: Lars (cherry picked from commit c5fa9eb1cb02d979502e2c9918d752c6708fb406)
\| \| \| \| * \|	Fix QTextEngine overflow caused by extremely long text	Jiang Jiang	2010-08-12	3	-33/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internally, QTextEngine use int to calculate most of the layout data required. If a string longer than 2^24 is passed into either QTextEngine or classes using it (QStackTextEngine, QPainter, QFontMetrics, etc.), overflow will happen because the memory size required to allocate for layout will become too large for int to handle. This patch will prevent these cases and add error handling mechanism for relevant code. Task-number: QT-3658 Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 05bb249c2ad3ee15eb205a806f8546c105683096)
\| \| \| \| * \|	Fix RightBearing confusion in text layout	mae	2010-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Negative RightBearing was wrongly taken into account when calculating the line wrap Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 975b1913e44128a3e9b9055f9bf2ff40d86adf2a)
\| \| \| \| * \|	Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813	Simon Hausmann	2010-08-12	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Integrated changes: \|\| <https://webkit.org/b/43782> \|\| [Qt] NPAPI plugins not drawn until page scrolled \|\| (cherry picked from commit 87b7587f25928272900900a106f360a4fbb4d6cd)
\| \| \| \| * \|	Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750	Jerome Pasion	2010-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit ac355872573c7131e4b783cabe00c5656dc668af)
\| \| \| \| * \|	qdoc: Cleaned up the application option specification and use.	Martin Smith	2010-08-11	5	-116/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The flags allowed on the command line are now: -online (default), -base, -assistant (same as -base), and -creator. If you don't specify one of these, you see a warning in the error output telling you that it didn't find an application flag and that it generated online docs by defualt. (cherry picked from commit d4dceca5dcd9252e09a421b65b318a7178049cd1)
\| \| \| \| * \|	Made changes to qdoc to allow it to accept a "style level" flag	Jerome Pasion	2010-08-11	2	-1/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit a53b98f9269e6ee0b524fe7477e8fb46f189f9d3)
\| \| \| \| * \|	qdoc: Removed three unused config variables.	Martin Smith	2010-08-11	8	-24/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These no longer do anything in qdocconf files: online = false offline = false creator = true (cherry picked from commit 7de8a0c487ce6a7f13c2028e93648807ef7d8e8b)
\| \| \| \| * \|	I18N: Update German translations for 4.7.0.	Friedemann Kleint	2010-08-11	5	-4629/+278
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 7ee7f19502bfd9193c624045bed07bdfdb23d1df)
\| \| \| \| * \|	I18n: Complete German translation for 4.7.0	Friedemann Kleint	2010-08-11	1	-2/+44
\| \| \| \| \| \|
\| \| \| \| * \|	Fix regression with SSL connections failing on symbian	Shane Kearns	2010-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a wrong ifdef sequence, the unix code was being compiled instead of the symbian code for retrieving the system certificates. Task-number: QTBUG-12718 Reviewed-by: Peter Hartmann (cherry picked from commit 8229eded4cba85ae53c1b03ce87981ebabd2f3ae)
\| \| \| \| * \|	QSslSocket: fix security vulnerability with wildcard IP addresses	Peter Hartmann	2010-08-11	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes Westpoint Security issue with Advisory ID#: wp-10-0001. Before, we would allow wildcards in IP addresses like *.2.3.4 ; now, IP addresses must match excatly. Patch-by: Richard J. Moore <rich@kde.org> Task-number: QT-3704 (cherry picked from commit 846f1b44eea4bb34d080d055badb40a4a13d369e)
\| \| \| \| * \|	Don't double-add item change listeners.	Michael Brasser	2010-08-11	3	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a Repeater was used as the child of an Item binding to childrenRect, the item change listener was being added twice for the items created by the Repeater. Task-number: QTBUG-12722 (cherry picked from commit 6feb5b75ce96aeeefee189af003949db8c031519)
\| \| \| \| * \|	Doc: Adding content to installation guide and fixing printing bugs	Morten Engvoldsen	2010-08-10	2	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 79797d175c41198b0dffad1dced021a07c5873ae)
\| \| \| \| * \|	Doc: Correcting bugs in the CSS	Morten Engvoldsen	2010-08-10	2	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 56cfbce20f736caa1ef74b5706fe3713ebd773c9)
\| \| \| \| * \|	Cherry-picked from: commit 47ba8dba3fe48d317974acd55afeea8a434c95f8	Jesper Thomschutz	2010-08-10	1	-453/+728
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Had to manually copy the file from that commit since the conflict was so wonky to resolve. Original Author is: Morten Engvoldsen <morten.engvoldsen@nokia.com> Date: Fri Jul 9 21:36:15 2010 +0200 Doc: Cleaning style and adding support for Creator Note: Support for creator has been disabled. HTML-generator needs an update.
\| \| \| \| * \|	Doc: Correcting img bug	Morten Engvoldsen	2010-08-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12028 (cherry picked from commit 0b8a7842975b195a17b3add4c98f64baeaedcf8c)
\| \| \| \| * \|	Doc: fixing style from 600 to bold weight	Morten Engvoldsen	2010-08-10	1	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit ea7aeec080c9c39449017ff683b27d3659236336)
\| \| \| \| * \|	doc: Re-introduced next/previous page links in the footer.	Martin Smith	2010-08-09	1	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-Nr: QTBUG-12278 (cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)
\| \| \| \| * \|	doc: Fixed some qdoc errors.	Martin Smith	2010-08-09	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit fc4e9d15d4b85ade770cf92c10258a556fafa698)
\| \| \| \| * \|	doc: Fixed some qdoc errors.	Martin Smith	2010-08-09	2	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 30d6f7ed29a2a5723387768cfe82a807a2724b8b)
\| \| \| \| * \|	doc: Fixed some S60 qdoc errors.	Martin Smith	2010-08-09	2	-0/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit fb6aa3b0769c33685ad38a13fe5ad0ca48679a93)
\| \| \| \| * \|	Translation work for 4.7	Pierre Rossi	2010-08-09	7	-514/+3003
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi (cherry picked from commit 209c017333fea9827fd20c7f8d23721bd8a6ee43)
\| \| \| \| * \|	Some more french translations.	qCaro	2010-08-09	1	-151/+156
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Pierre (cherry picked from commit 4fd04190ab3800fde261293acd4bcf11cf449dee)
\| \| \| \| * \|	Some french translations	Pierre Rossi	2010-08-09	6	-3071/+2549
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: gabi (cherry picked from commit 065cc163d7848131dcfd8bb210c8590b6cd11991)
\| \| \| \| * \|	Revert "fix compilation with -plugin-kbd-*"	Toby Tomkins	2010-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 815ae300c9feb1930a338e8ab49589b14c57d0de.
\| \| \| \| * \|	Fix broken example code	Bea Lam	2010-08-08	1	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12705 (cherry picked from commit 59e3430662cfdc3820115a2ff4c0b44829b3d1d4)
\| \| \| \| * \|	Fix index page	Bea Lam	2010-08-08	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12703 (cherry picked from commit 97f64280e37f29bdeb92d6de55fac56b1ff37084)
\| \| \| \| * \|	Top-level QML item should not have special focus handling.	Michael Brasser	2010-08-08	2	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's the scene itself that acts as a focus scope, not the top-level item. Task-number: QTBUG-12682 Reviewed-by: Aaron Kennedy (cherry picked from commit 94b1c07c31ab84d30b198cb23291a48f98164827)
\| \| \| \| * \|	Improve docs on QML Animation page and associated elements	Bea Lam	2010-08-08	18	-298/+843
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12666 (cherry picked from commit a9aaaf30b6c542b5c9e3c1e1681088ab26a530c0)
\| \| \| \| * \|	Rename example component file for clarity	Bea Lam	2010-08-08	4	-8/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12633 (cherry picked from commit dc2f700a006d827db0eaf8d1e01e4d9c7c8c0baa)
\| \| \| \| * \|	fix compilation with -plugin-kbd-*	Oswald Buddenhagen	2010-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it certainly is not such a good idea to write mouse when one means kbd ... Task-number: QTBUG-12483 (cherry picked from commit 9f6bcd7ff39462ec2028ddbe27fc04911b856018)
\| \| \| \| * \|	Fix warning from whining complier.	Martin Jones	2010-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12473 Reviewed-by: Aaron Kennedy (cherry picked from commit 1ca575eaf7c166f823b82132110ea066be819540)
\| \| \| \| * \|	Modified descriptions of QBasicTimer class and isActive() function.	Jerome Pasion	2010-08-08	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed by: David Boddie Task: QTBUG-12313 (cherry picked from commit ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d)
\| \| \| \| * \|	doc: Re-introduced next/previous page links in the footer.	Martin Smith	2010-08-08	1	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-Nr: QTBUG-12278 (cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)
\| \| \| \| * \|	Adding a description for the Spectrum Analyzer demo. For QTBUG-12180	Jerome Pasion	2010-08-08	1	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed by: David Boddie (cherry picked from commit 4bc408c6faade543c76fa0c7b8841ce72c239688)
\| \| \| \| * \|	Increase maximum heap size of QML Viewer	Joona Petrell	2010-08-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-12029 Reviewed-by: Martin Jones (cherry picked from commit 4692a507dcdfbc830a0885016b6bd0bab4480bad)
\| \| \| \| * \|	Removed duplicate case for const variable snippet.	Jerome Pasion	2010-08-08	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewer: David Boddie Task number: QTBUG-10411 (cherry picked from commit 1f32f4013ab9178e8434bff847013a84491fe516)