Feature #7376