Port over 1.2 release from legacy repository