Feature #7379