Bugfixes

To 7.1, 8.1, 8.2, 8.3, 12.1