#IJPL-184877 Fixed (cherry picked from commit d3320dddf8d8143745141f9c2a72581927d5e243) IJ-CR-176617 GitOrigin-RevId: 2d92850b4fe9597ff25c219a4f73ebcf8bea2ef0