Merge commit 'fb3635748c3d5e95cca8e6b5160d776bd7298ee8'
Merge commit 'c280d6cb8677ed16d874f06bc7429e5eff8cc6f3'
fix bug for intro tour