Performance changes
Star images not shown on profile
Merge remote-tracking branch 'origin/stable'