Bumping tested up to 3.6-alpha-23797