[68068010] changes after review