3.16.y.4 release (3.16.6+)