add
Merge remote-tracking branch 'origin/master' into 0716-firebase2
fixed tags autoblock
Merge branch '0716-firebase2'