...G...... [ZBXNEXT-8512] light optimisation