Merge tag '1.2' into develop

Version 1.2
s
Updated Carrington Core to 3.4
Merge branch 'release/1.2.1'