Version 1.2.1 changes merged

Merged the v1.2.1 changes from Stable.