EST-233: in sync with DN 3.2.7, ISIS-477