Release for tag 3.6