cherry-pick the fix from release/2.2#183

ComixHe merged 1 commit into

OpenAtom-Linyaps:masterOpenAtom-Linyaps/linyaps-box:masterfrom

ComixHe:masterComixHe/linyaps-box:masterCopy head branch name to clipboard