Revert "Merge branch 'cherry-pick-9cf4ae48' into 'releases/2.6'"
See merge request !43 (merged)
(cherry picked from commit 409f3056)
de4d5147 Revert "Merge branch 'cherry-pick-9cf4ae48' into 'releases/2.6'"