Fix typo
Fix site update location tracking
fix publishing user issue
Merge branch 'hotfix' into dev