Merged changes from upstream/dev before jpeg emoji
fixed untouchable links
(cherry picked from commit ee38ece)