Checking an update between user-activity and master branches

:zap: