Feature #6232