GPPLATUI-23 improvement.