some tweaks and fixes to d417f7b and 3dcbbc2

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.4+
| Fixed tickets | 

some tweaks and fixes to d417f7b and 3dcbbc2