Just for the record: the patch is commited in master for 1.21, and in server-1.20-branch for 1.20.6. Samuel