issue 4803: merge code with production
issue 4803: merge code with production