Issues #6340 and #7702