Abandoned, partially completed work for comparison against master-1.2-base