Merge 2.1.x into 3.0.x#1111

ghostwriter merged 5 commits into

3.0.xghostwriter/option:3.0.xfrom

merge-up/2.1.x-into-3.0.xghostwriter/option:merge-up/2.1.x-into-3.0.xCopy head branch name to clipboard