Js dsc700

This branch contains all the minor changes for the 1.2.1 release