Version 1.2.1 notes
Merge branch '1-2-develop'