Feature #6679 and Feature #6677