Update for v1.2.0 from rev 103ad4e