New upstream release 0.22.04