NLE-21678

NLE-21678