NCR-5684/5685

For user: