fixed ass view
Merge remote-tracking branch 'origin/alpha' into alpha