........S. [ZBXNEXT-1782] aesthetic refinements for Sasha's improvements in r44722:44730