Merge branch 'master' into clear_user_avatar_image