[6.12.z] Add coverage for BZ#2092039 and update few docstrings

[6.12.z] Add coverage for BZ#2092039 and update few docstrings #2931