patch-21-6