Update from desktop.
Fix merge conflict.