unblock merge of 73917, it is needed to fix issue 3392