...G...... [ZBXNEXT-497] core style corrections