Experimental Tenshi patches, with historical commits of previous releases