16.7.2.9 patch?

[shannons]

Merged with current ongoing dicussion on this topic.