3.16.y.5 release (3.16.6+)