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

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