Merge branch 'master' into updating-users
Fixed