merged in all branches >= 8.6