This fixes #7739 and is work on bug #7733.