Upgrade to master 3.3.0