Merge branch 'UserNotification_fallback_to_utf8' into 'master'