Release 2 1 2

merging changes from branch release 2.1.2