tagged for new release 6.x-3.4