Started work on 1.3: Various changes