upstream version 3.4