Release v1.2.1

Merged Akshay Bharambe requested to merge devbranch into staging