Branch: refs/heads/master
Home: https://github.com/tribe29/checkmk
Commit: f6ed202c4a19f9b81bb1637647440a75afc069dc
https://github.com/tribe29/checkmk/commit/f6ed202c4a19f9b81bb1637647440a75a…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/base/config.py
Log Message:
-----------
improve doc string
Change-Id: I21451ab979d7240e5ac4ebe5eac603bf9d9f9d76
Commit: 2ef79b5ea83ba7a8f12997c92b1618095b002021
https://github.com/tribe29/checkmk/commit/2ef79b5ea83ba7a8f12997c92b1618095…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/base/_autochecks.py
M cmk/base/agent_based/checking/_checking.py
M cmk/base/agent_based/discovery/_discovery.py
M cmk/base/agent_based/discovery/autodiscovery.py
M cmk/base/agent_based/discovery/preview.py
M cmk/base/automations/check_mk.py
M cmk/base/config.py
M cmk/base/core_nagios.py
M cmk/base/modes/check_mk.py
M tests/unit/cmk/base/agent_based/discovery/test_discovery.py
Log Message:
-----------
variable renamings for clarity
Change-Id: I3e02032098af933ad8b2a0b2fae4baed5c9f440f
Commit: 9105e23bac4d7c6c33673b6b47d901630a6d2b3c
https://github.com/tribe29/checkmk/commit/9105e23bac4d7c6c33673b6b47d901630…
Author: Mathias Laurin <mathias.laurin(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/base/agent_based/utils.py
Log Message:
-----------
Separate resolver from user in get_section_kwargs
Next step is to resolve ASAP and pass the dict to its users
in the call stack. This way, we would resolve *once* and
use wherever needed. Then, we don't need to memoize in the
data provider anymore.
Change-Id: Id1351bdd6cd4eac517c93999dce5302a174214a0
Commit: 3cc1692bc6d83ef6b3076c90d5e6eece868a124c
https://github.com/tribe29/checkmk/commit/3cc1692bc6d83ef6b3076c90d5e6eece8…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/plugins/wato/special_agents/gcp.py
Log Message:
-----------
agent gcp rulespec: migrate CCE -> CEE
CMK-12251
Change-Id: I099a6a154cfc17d04ce067bd880f03731950bda0
Commit: ad0578905685546c002f35a11d41229630d303c1
https://github.com/tribe29/checkmk/commit/ad0578905685546c002f35a11d4122963…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/plugins/wato/special_agents/azure.py
Log Message:
-----------
agent azure rulespec: migrate CCE -> CEE
Change-Id: I4bf37f964346e7b50b2e52d33190ecd36e9cbaf3
Commit: 4573ba73965a0e1696856c139c1489a114e47e8f
https://github.com/tribe29/checkmk/commit/4573ba73965a0e1696856c139c1489a11…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/plugins/wato/special_agents/kube.py
Log Message:
-----------
agent kube rulespec: minor refactoring
This increases symmetry thus making it more readable.
Change-Id: I3487f96019d20b12d6865ae0c069c1a4383a84a5
Commit: 2003ede29d64e4c4fbb0849b53461ebaaf6349b6
https://github.com/tribe29/checkmk/commit/2003ede29d64e4c4fbb0849b53461ebaa…
Author: Lukas Lengler <lukas.lengler(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/unit/cmk/base/plugins/agent_based/test_bgp_peer.py
Log Message:
-----------
Cleanup unittests for bgp_peer
SUP-10721
Change-Id: I89deccc65f3a7c291f3b194a37732e009666b994
Commit: 778495a7261097fd5f60614af56a95dd6bd31b5c
https://github.com/tribe29/checkmk/commit/778495a7261097fd5f60614af56a95dd6…
Author: LukaRacic <luka.racic(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
A .werks/15496
M cmk/base/plugins/agent_based/esx_vsphere_snapshot.py
M cmk/special_agents/agent_vsphere.py
M tests/unit/cmk/base/plugins/agent_based/test_esx_vsphere_snapshots.py
Log Message:
-----------
15496 esx_vsphere_snapshot: Added vm name to the snapshot summary
With the introduction of this werk the esx_vsphere_vm_snapshots_summary will include the VM name in addition to the snapshot name.
So now the summary will look something like this: "vm_name/snapshot_name".
SUP-12725
Change-Id: I3c9c12765f7c2e94beadb83fbba3bf76f96de94c
Commit: 6d453bd36aaf49d78702b7b90e52d638381c4e9a
https://github.com/tribe29/checkmk/commit/6d453bd36aaf49d78702b7b90e52d6383…
Author: LukaRacic <luka.racic(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/unit/cmk/special_agents/test_agent_vsphere.py
Log Message:
-----------
agent_vsphere: Added test for the function
Change-Id: I4b8a90faeddb1d561dae02bab0f683bf0330a444
Compare: https://github.com/tribe29/checkmk/compare/af61bd798e23...6d453bd36aaf
Branch: refs/heads/2.2.0
Home: https://github.com/tribe29/checkmk
Commit: 4d14fd01fbc57d64b31ea7910429a30757041d73
https://github.com/tribe29/checkmk/commit/4d14fd01fbc57d64b31ea7910429a3075…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/plugins/wato/special_agents/gcp.py
Log Message:
-----------
agent gcp rulespec: migrate CCE -> CEE
CMK-12251
Change-Id: I099a6a154cfc17d04ce067bd880f03731950bda0
Commit: e92d40215d1804f013091a7953661d57aa94b0d8
https://github.com/tribe29/checkmk/commit/e92d40215d1804f013091a7953661d57a…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/plugins/wato/special_agents/azure.py
Log Message:
-----------
agent azure rulespec: migrate CCE -> CEE
Change-Id: I4bf37f964346e7b50b2e52d33190ecd36e9cbaf3
Commit: f1ecb897be308fdbb08a431f6f82b0fdf800868d
https://github.com/tribe29/checkmk/commit/f1ecb897be308fdbb08a431f6f82b0fdf…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/plugins/wato/special_agents/kube.py
Log Message:
-----------
agent kube rulespec: minor refactoring
This increases symmetry thus making it more readable.
Change-Id: I3487f96019d20b12d6865ae0c069c1a4383a84a5
Commit: 9f154bf43fb23631a2997e1222a4eb2aa80afd2f
https://github.com/tribe29/checkmk/commit/9f154bf43fb23631a2997e1222a4eb2aa…
Author: Mathias Laurin <mathias.laurin(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/base/agent_based/utils.py
Log Message:
-----------
Separate resolver from user in get_section_kwargs
Next step is to resolve ASAP and pass the dict to its users
in the call stack. This way, we would resolve *once* and
use wherever needed. Then, we don't need to memoize in the
data provider anymore.
Change-Id: Id1351bdd6cd4eac517c93999dce5302a174214a0
(cherry picked from commit a557243031a2b53212a9330e93dfb81a0fca66f8)
Commit: 48bd9236ac89521de14c41c6b7643432af5e3347
https://github.com/tribe29/checkmk/commit/48bd9236ac89521de14c41c6b7643432a…
Author: LukaRacic <luka.racic(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
A .werks/15496
M cmk/base/plugins/agent_based/esx_vsphere_snapshot.py
M cmk/special_agents/agent_vsphere.py
M tests/unit/cmk/base/plugins/agent_based/test_esx_vsphere_snapshots.py
Log Message:
-----------
15496 esx_vsphere_snapshot: Added vm name to the snapshot summary
With the introduction of this werk the esx_vsphere_vm_snapshots_summary will include the VM name in addition to the snapshot name.
So now the summary will look something like this: "vm_name/snapshot_name".
SUP-12725
Change-Id: I3c9c12765f7c2e94beadb83fbba3bf76f96de94c
Commit: 76207b9b9811a061b8d4a7b5014ad29dd9bd556d
https://github.com/tribe29/checkmk/commit/76207b9b9811a061b8d4a7b5014ad29dd…
Author: LukaRacic <luka.racic(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/unit/cmk/special_agents/test_agent_vsphere.py
Log Message:
-----------
agent_vsphere: Added test for the function
Change-Id: I4b8a90faeddb1d561dae02bab0f683bf0330a444
(cherry picked from commit b1617b6f1f72e5c7d319aa258852c9f21eca96b9)
Compare: https://github.com/tribe29/checkmk/compare/fea00566377f...76207b9b9811
Branch: refs/heads/2.1.0
Home: https://github.com/tribe29/checkmk
Commit: 47d70156a2fe8a1fd551cdefe68665318fce56c5
https://github.com/tribe29/checkmk/commit/47d70156a2fe8a1fd551cdefe68665318…
Author: LukaRacic <luka.racic(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
A .werks/15496
M cmk/base/plugins/agent_based/esx_vsphere_snapshot.py
M cmk/special_agents/agent_vsphere.py
M tests/unit/cmk/base/plugins/agent_based/test_esx_vsphere_snapshots.py
Log Message:
-----------
15496 esx_vsphere_snapshot: Added vm name to the snapshot summary
With the introduction of this werk the esx_vsphere_vm_snapshots_summary will include the VM name in addition to the snapshot name.
So now the summary will look something like this: "vm_name/snapshot_name".
SUP-12725
Change-Id: I3c9c12765f7c2e94beadb83fbba3bf76f96de94c
Commit: c0df210c99379e4db81a72f6167ed84c17cd21f8
https://github.com/tribe29/checkmk/commit/c0df210c99379e4db81a72f6167ed84c1…
Author: LukaRacic <luka.racic(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/unit/cmk/special_agents/test_agent_vsphere.py
Log Message:
-----------
agent_vsphere: Added test for the function
Change-Id: I4b8a90faeddb1d561dae02bab0f683bf0330a444
(cherry picked from commit 7276fb5382059b89f5c2afc7a38d0e3843db5281)
Compare: https://github.com/tribe29/checkmk/compare/240c20f25cc8...c0df210c9937
Branch: refs/heads/master
Home: https://github.com/tribe29/checkmk
Commit: ac825afd056b93eaa68992f270c651be85cabdad
https://github.com/tribe29/checkmk/commit/ac825afd056b93eaa68992f270c651be8…
Author: Matteo Stifano <matteo.stifano(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/testlib/openapi_session.py
Log Message:
-----------
Fix discover_services in openapi_session module
Not defining a CMK version in the discover-services method is currently
leading to an error due to the impossibility to compare the versions as
strings.
This change fixes it.
Change-Id: I7528088b32a67a9698d50f352e5537d9f7f70d12
Commit: af61bd798e2389bfa60a71c90dd374feb43620d5
https://github.com/tribe29/checkmk/commit/af61bd798e2389bfa60a71c90dd374feb…
Author: Konstantin Baikov <konstantin.baikov(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/ec/export.py
M cmk/ec/rule_matcher.py
M cmk/gui/mkeventd/rule_matching.py
M tests/unit/cmk/ec/test_ec_misc.py
M tests/unit/cmk/ec/test_rule_matching.py
Log Message:
-----------
Use std lib ipaddress to match ip networks
This also allows to use ipv6 for free
Change-Id: I9cb582bd4ebc03f90c28ade385528385d652a4b8
Compare: https://github.com/tribe29/checkmk/compare/75bc8108d588...af61bd798e23
Branch: refs/heads/2.2.0
Home: https://github.com/tribe29/checkmk
Commit: b963b26a76ab414e2d887878b970b0123f262e6b
https://github.com/tribe29/checkmk/commit/b963b26a76ab414e2d887878b970b0123…
Author: Sergey Kipnis <sergey.kipnis(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
A .werks/14951
M agents/wnx/install/Product.wxs
Log Message:
-----------
14951 Windows agent supports Windows 7, Windows Server 2008 R2 or newer
Change-Id: Iddaa9eb9823b20211ca7a5f410ec138b36dc93db
Commit: 06b3a2ff56adddcae516378b69fd0d629e8eb0a4
https://github.com/tribe29/checkmk/commit/06b3a2ff56adddcae516378b69fd0d629…
Author: Kenneth Okoh <kenneth.okoh(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/valuespec.py
M cmk/gui/visuals/__init__.py
M web/htdocs/js/modules/forms.ts
Log Message:
-----------
Label filters: Reduce number of HTTP vars
... and let the rendering show only the parsed value (given as a py fct
argument) and not gather possibly wrong values from the request.
CMK-12331
Change-Id: I74da67fcb7f0d1775466e0d31dc585e3038a4df1
Compare: https://github.com/tribe29/checkmk/compare/dd4ba2a9f777...06b3a2ff56ad
Branch: refs/heads/master
Home: https://github.com/tribe29/checkmk
Commit: 56a6c02b22f6a3aec5fd8b54454a283e1547729d
https://github.com/tribe29/checkmk/commit/56a6c02b22f6a3aec5fd8b54454a283e1…
Author: Mathias Laurin <mathias.laurin(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/testlib/site.py
Log Message:
-----------
Revert "Reland "Instrument tests with helgrind""
This reverts commit 2f7164421cb9d5969bee9687ffc065c0281637bd.
Commit: 03ab7feef664a8028c59a7a06aac1e692fd9c000
https://github.com/tribe29/checkmk/commit/03ab7feef664a8028c59a7a06aac1e692…
Author: Kenneth Okoh <kenneth.okoh(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/valuespec.py
M cmk/gui/visuals/__init__.py
M web/htdocs/js/modules/forms.ts
Log Message:
-----------
Label filters: Reduce number of HTTP vars
... and let the rendering show only the parsed value (given as a py fct
argument) and not gather possibly wrong values from the request.
CMK-12331
Change-Id: I74da67fcb7f0d1775466e0d31dc585e3038a4df1
Commit: bbb57f06c59072670b9c1ff44078ce59ff00aeac
https://github.com/tribe29/checkmk/commit/bbb57f06c59072670b9c1ff44078ce59f…
Author: Teresa Siegmantel <teresa.siegmantel(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
A .werks/13975
M cmk/gui/plugins/openapi/endpoints/ruleset/fields.py
Log Message:
-----------
13975 FIX 'group' parameter has been removed from rulset search
The 'group' query parameter in the ruleset search/list endpoint
(GET "/domain-types/ruleset/collections/all") has been removed, since
it was non functional and didn't make much sense in the context
of a ruleset search.
Change-Id: I4b4979b6a592c2d00834ac6ea05ca638d865253f
Commit: 6de68901cc3a4026e74c400aadae4b6911f96f32
https://github.com/tribe29/checkmk/commit/6de68901cc3a4026e74c400aadae4b691…
Author: Solomon Jacobs <solomon.jacobs(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M checks/hp_proliant_power
Log Message:
-----------
modernize hp_proliant_power
Change-Id: I775cb9f36402401ef9684322f2fff81e6633ad80
Commit: 654afb1a789a00a170c4d0658d5ab5fa216da33d
https://github.com/tribe29/checkmk/commit/654afb1a789a00a170c4d0658d5ab5fa2…
Author: Solomon Jacobs <solomon.jacobs(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
R checks/hp_proliant_power
A cmk/base/plugins/agent_based/hp_proliant_power.py
R tests/unit/checks/generictests/datasets/hp_proliant_power.py
M tests/unit/checks/test_generic_legacy_conversion.py
A tests/unit/cmk/base/plugins/agent_based/test_hp_proliant_power.py
M tests/unit/cmk/gui/plugins/wato/check_parameters/test_plugin_vs_wato.py
Log Message:
-----------
migrate hp_proliant_power
Change-Id: I44b10dafd02de7c026531e7dce2d33be368bbe49
Commit: f0f3a440d0d2f1aa69e6342f26967b2b7d98c47e
https://github.com/tribe29/checkmk/commit/f0f3a440d0d2f1aa69e6342f26967b2b7…
Author: Matteo Stifano <matteo.stifano(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/testlib/openapi_session.py
M tests/testlib/version.py
M tests/update/conftest.py
M tests/update/test_update.py
Log Message:
-----------
Create host and perform service discovery on test_update
We here introduce API requests to create a new host and perform a
service discovery in such host for the test_update site.
In order to perform Service Discovery via API for CMK versions
< 2.2.0, we need to re-introduce old code in the testlib module taken
from the 2.1.0 branch.
Change-Id: Id95d11931b43f371181947caef4d48f348b7cfe1
Commit: 22bdc0ded0cfcc01c2f31d8395345fbcc6142f9d
https://github.com/tribe29/checkmk/commit/22bdc0ded0cfcc01c2f31d8395345fbcc…
Author: Matteo Stifano <matteo.stifano(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/update/conftest.py
Log Message:
-----------
Define base-version test params as list of strings
We here define the base-version list to be used in test-update as list
of strings to increase readability.
Change-Id: Idaa256fd428b898d9d8a325dbf4183cbbd457291
Commit: 17701f48ca877e0354bc3ad9fd5eeb5af37ccf38
https://github.com/tribe29/checkmk/commit/17701f48ca877e0354bc3ad9fd5eeb5af…
Author: Matteo Stifano <matteo.stifano(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/update/conftest.py
M tests/update/test_update.py
Log Message:
-----------
Retrieve and assert services' status in test-update
We here retrieve all services' status and we assert tha the total number
of services does not change inbetween the update process.
Change-Id: I1635069019d7c2d33158b84debe828f8ef3de6ef
Commit: 4da6a023fc517101a5587427f5890ce8a2f54acf
https://github.com/tribe29/checkmk/commit/4da6a023fc517101a5587427f5890ce8a…
Author: Matteo Stifano <matteo.stifano(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M tests/Makefile
Log Message:
-----------
Revert "Define log level in the update-tests suite"
This reverts commit bd9278b65468abe93c9c2f9f2bb88287b3a8f5fa.
Reason for revert: <log-cli-level=INFO already defined in PYTEST_SYSTEM_TEST_ARGS variable>
Change-Id: I4755c53785c92d215eee4babc036cd13e83452b9
Commit: 5e495b96ba52d89e92628cd33b9f42c60a2e165f
https://github.com/tribe29/checkmk/commit/5e495b96ba52d89e92628cd33b9f42c60…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/utils/packaging/__init__.py
Log Message:
-----------
extension packages: dedicated for loop for callbacks
Change-Id: I19204f9e75fd60237f81b6c84104f4747026378d
Commit: b55adbeb1419f784864d37dc1e55a4907e21792c
https://github.com/tribe29/checkmk/commit/b55adbeb1419f784864d37dc1e55a4907…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/utils/packaging/__init__.py
Log Message:
-----------
extension packages: factor out file removal
Change-Id: I9828b9f53fd2b996c6b34c0a315b828dfabd0b07
Commit: 75f1ac5da825ddd5f6646b1aa6765ed025cfc079
https://github.com/tribe29/checkmk/commit/75f1ac5da825ddd5f6646b1aa6765ed02…
Author: Moritz Kiemer <moritz.kiemer(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
R omd/packages/nagios/NAGIOS_THEME
M omd/packages/nagios/nagios.make
R omd/packages/nagios/skel/etc/nagios/apache.conf
M omd/packages/omd/omdlib/config_hooks.py
M tests/integration/omd/test_hooks.py
M tests/unit/cmk/base/test_diagnostics.py
M tests/unit/cmk/gui/watolib/test_activate_changes.py
M tests/unit/cmk/utils/test_site.py
M tests/unit/conftest.py
Log Message:
-----------
clean up NAGIOS_THEME
Change-Id: I44ec13b0486d56bb80815f3867c8257a4355f54a
Commit: 75bc8108d5886c6f1c1cc2e24d87471f0ff4bf58
https://github.com/tribe29/checkmk/commit/75bc8108d5886c6f1c1cc2e24d87471f0…
Author: Kenneth Okoh <kenneth.okoh(a)tribe29.com>
Date: 2023-03-16 (Thu, 16 Mar 2023)
Changed paths:
M cmk/gui/wato/pages/users.py
M cmk/gui/watolib/users.py
Log Message:
-----------
Automation secret: More understandable error display
CMK-11783
Change-Id: Ie6d4f65efa324f895602a6f980e8f50768820d19
Compare: https://github.com/tribe29/checkmk/compare/b1cee0ea3240...75bc8108d588
Branch: refs/heads/2.0.0
Home: https://github.com/tribe29/checkmk
Commit: 902423a9099a64575829347a63f38f6452d32a51
https://github.com/tribe29/checkmk/commit/902423a9099a64575829347a63f38f645…
Author: Lukas Lengler <lukas.lengler(a)tribe29.com>
Date: 2023-03-15 (Wed, 15 Mar 2023)
Changed paths:
A .werks/14730
M cmk/base/plugins/agent_based/logwatch_ec.py
Log Message:
-----------
14730 FIX Logwatch EC forwarding using spool files
When using Logwatch EC fordwarding using spool files with a hostname
having a file ending (p.e. myhost.com) some messages would be overwritten
and therefore these messsage were not forwarded to the event console.
SUP-13558
Change-Id: I534181f53958f12bb234b482b52b7ade995bc73e