Feature #5834