Merge branch 'user-status' into staging2