Feature #8733 and Feature #8725