Tag release 3.20.4