[2789] Add forgotten part of [2787]