update for upstream version 3.3.5