integrating feature #5523