getting in synch w/ current upstream 2.1.7