Merge "Crash in the touch explorer." into jb-dev