Release/1.2.1#29

902seanryan merged 2 commits intomainSpringRoll/Automated-QA:mainfrom

release/1.2.1SpringRoll/Automated-QA:release/1.2.1Copy head branch name to clipboard