Fix bug crash when transfer view
Merge commit '8ae28f31c745e6bd29f403be056b8953bb3c635b' into develop