(ITS#9160) Out-of-memory handling issues