V1.2.1 merge Hotfix.