Feature #6260